[automerger skipped] Merge "[DO NOT MERGE] Fix BroadcastDispatcher registering with CURRENT" into rvc-dev am: 080957bd am: a90c5abc am: f92cc695 am: 18bf5723 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ibe0acbbdae6a75145d4b22cbef4e104b3ff56fc6