[automerger skipped] [DO NOT MERGE] Fix BroadcastDispatcher registering with CURRENT am: e771b7529e am: b6aad7ec1e am: 4c417f6ca7 am: e726d32999 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11792343 Change-Id: Icb606acb9050eb8bcc553e7a38953c55d1ee874b
This commit is contained in: