Merge "Remove hidden APIs usage regarding to dump" am: c506ddca am: 93c42006

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4152e7cfdc14d4372319e66a67b117a94aedc80b