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

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



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