[automerger skipped] Merge "Update current.txt for Broadcast feature supported...

[automerger skipped] Merge "Update current.txt for Broadcast feature supported API" am: 72f1c569 am: 3fb2bbc2 am: a3ea867d am: 34ed1076 -s ours

am skip reason: Merged-In Id9bf7731f61b38da878b1cc0fe117d80044a82d9 with SHA-1 5406c438 is already in history

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

Change-Id: I7c73c47e6e2cb614c4d11a3b0c38e28329d1be77