Merge "Allow a drawn reported activity to keep screen brightness" am: 8fadd7d0c7 am: 06edff9b3e

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

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