Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into...

Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" into tm-qpr-dev am: 31cd5304

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



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