[automerger skipped] Merge "[DO NOT MERGE] Fix BroadcastDispatcher registering with CURRENT" into rvc-dev am: 080957bd25 am: a90c5abc89 am: 43ed483221 am: 8b4c438391 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11792343 Change-Id: Ie90bfae8a5bc9463e70d7ca158c7af2b62a5298a
This commit is contained in: