[automerger skipped] Merge "Accomodate brightness space change for client...

[automerger skipped] Merge "Accomodate brightness space change for client target" into tm-dev am: c27991ab -s ours

am skip reason: Merged-In I9ceec3af80f503df0debe434bb454ec42694811b with SHA-1 f8d093dc is already in history

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

Change-Id: Ieb489596d9d3ee735563fdc511fc73de44c057fd