[automerger skipped] Merge "Fix LegacyGlobalActions broadcast receiver" into...

[automerger skipped] Merge "Fix LegacyGlobalActions broadcast receiver" into sc-dev am: 6a6b9eff am: 7fb4d933 -s ours

am skip reason: Merged-In I10405769ba6426c7bbcd31e09e1cd4c99585665b with SHA-1 a6d73351 is already in history

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

Change-Id: Ifeac3e1a88c55b1a64aa605e0728ec63703972d3