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