Merge "Update user consent dialog for device log access" into tm-dev am: adf9921e

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



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