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

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



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