Merge "Revert "Get rid of double measure"" into tm-dev am: 80832d2efe am: 559d13bcc1 am: 13a72935ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19119508 Change-Id: Ia3804f45a9d9d5f41ab845ca5e2905bdc128136b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: