Merge changes from topic "DistractingPackageHelper_tm-dev" into tm-dev am: 58f33528

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



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