[automerger skipped] Merge changes from topic "r3_flicker_high_brightness"...

[automerger skipped] Merge changes from topic "r3_flicker_high_brightness" into rvc-qpr-dev am: 11bee77d am: bce28218 -s ours

am skip reason: Change-Id I2ac8d95f976748d03f6dc2e60725e9ef1213ed6f with SHA-1 57935090 is in history

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

Change-Id: I5417e797142ae88d16c55b39b1be5d6df18312e1