Merge "Update font/color of user consent dialog for device log access" into...

Merge "Update font/color of user consent dialog for device log access" into tm-dev am: 2211b359 am: 414e2ca1

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



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