Merge "Create a private flag to control shouldOptimizeMeasure" into tm-qpr-dev am: e4f90a961f am: 02fab80b66

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

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