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

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



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