This reverts commit 0fbeed22d4. Reason for revert: reverting this due to landing pixel scaling Bug: 335357341 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fc1317679b29f312b183e1bbb156b7c7cd8b0da0) Merged-In: Idd0af2eaf5933b708e6a3831bf2f751c747a4f38 Change-Id: Idd0af2eaf5933b708e6a3831bf2f751c747a4f38
0fbeed22d4