Merge changes from topic "r3_flicker_high_brightness" into rvc-qpr-dev am: 11bee77de6

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

Change-Id: I10794b1337fca712f2c751ce01b87ea86977cfdf