[automerger skipped] Merge "unite all locks under BroadcastRadio" into...

[automerger skipped] Merge "unite all locks under BroadcastRadio" into sc-v2-dev am: 845a0053 am: 67405fba -s ours

am skip reason: Merged-In I5f51c0e0a04ae10428f721be508d5579dc1dd837 with SHA-1 2cdb566a is already in history

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

Change-Id: Ie5afd5c2593877588666e04e205fcf281f075ccd