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

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



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