Merge "Merge "Merge "Don't export HeapDumpProvider." into rvc-dev am:...

Merge "Merge "Merge "Don't export HeapDumpProvider." into rvc-dev am: 3b6512d8 am: 771ea87c" into sc-dev am: d41a4940 am: 9bc77519" into sc-v2-dev-plus-aosp am: 85e2a9fe

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

Change-Id: Idaf8058607cfdc1b7559c2e45eedd67d8ac84790