[automerger skipped] [automerge] Listening to package broadcast on all users 2p: da731460 am: 8ef5ce85 -s ours

am skip reason: Merged-In I1f1b9a5b8f63d6564c9e121bee7d6d6d697b471d with SHA-1 6c9df302 is already in history

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

Change-Id: I0ccd731d5b681ba409d141563419a98fb1dedf94