[automerger skipped] Introduce DistractingPackageHelper am: 0f3307a7 am: 2c4203ab -s ours

am skip reason: Merged-In I4e44c1f039318bf02d00ff6a6b8b973244108008 with SHA-1 ba631e3c is already in history

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



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