[automerger skipped] Merge "Fix Settings app ANR due to blocking...

[automerger skipped] Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev am: de5c8613 am: 330a6b22 -s ours

am skip reason: Merged-In I0b88ef089097930b62dcb1cb7d6fe9990356ab5d with SHA-1 f7b8d687 is already in history

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



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