This reverts commit 5362448646. Reason for revert: Reverting this due to landing pixel scaling Bug: 335357341 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9683d7ab3c6f2f7be00b31d4a6e35a2ff9cf13b7) Merged-In: I4f9392d649cc927a24222207501f5191bd63c5a1 Change-Id: I4f9392d649cc927a24222207501f5191bd63c5a1
5362448646