[automerger skipped] Merge "Support AIDL IDumpstateDevice service in verbose...

[automerger skipped] Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev am: 31cd5304 am: c21d77b7 -s ours

am skip reason: Merged-In I4a2ec44092804574a60113e5be3df19b586bfa64 with SHA-1 17a9fb6b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19885633



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