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

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



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