[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "DistractingPackageHelper_tm-dev" into tm-dev am: 58f33528 -s ours

am skip reason: Merged-In Iffcbe33ff484dc05f9e45b9a9e47be972bb157e9 with SHA-1 47f85e66 is already in history

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



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