Merge "Revert "Get rid of double measure"" into tm-dev am: 80832d2e am:...

Merge "Revert "Get rid of double measure"" into tm-dev am: 80832d2e am: 559d13bc am: 13a72935 am: e0a617bd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19119508



Change-Id: I31bf7036106525c9783c74d22d3dfb8447e4a2d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>