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