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

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



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