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

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



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