[automerger skipped] Merge "Fix a lot of OVERLAY_CHANGED broadcasts" into...

[automerger skipped] Merge "Fix a lot of OVERLAY_CHANGED broadcasts" into tm-qpr-dev am: 3e238386 am: 54084b90 -s ours

am skip reason: Merged-In I247aa6d2abce28eebe60e622dbffad12d1c9540c with SHA-1 a3adecc4 is already in history

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



Change-Id: Ic81f0574fc224c8c016fc2f7e853deec3d072c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>