[automerger skipped] Merge "[DO NOT MERGE] Fix BroadcastDispatcher registering...

[automerger skipped] Merge "[DO NOT MERGE] Fix BroadcastDispatcher registering with CURRENT" into rvc-dev am: 080957bd am: 12c1e5f1 am: f24da891 am: 5385d449 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I398083380dd6fe66024cfa64ad8f80e3c8f77567