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

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



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