Merge "Allow a drawn reported activity to keep screen brightness" am:...

Merge "Allow a drawn reported activity to keep screen brightness" am: 8fadd7d0 am: 06edff9b am: e32d76b3 am: 34b9cb3c am: de759ed5 am: 65094381

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



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