[DO NOT MERGE] Fix BroadcastDispatcher registering with CURRENT am: e771b7529e am: 9cd62519c1

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

Change-Id: Ieb8030546ccf7174989750b75339ad8cf31f8139