Merge "Add a lock independent check for internal display while logging manual...

Merge "Add a lock independent check for internal display while logging manual brightness events." into udc-dev am: 30b6c196

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



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