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

[automerger skipped] Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" am: f7200dd5 -s ours am: a78f068b -s ours

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

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



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