[automerger skipped] Merge "Remove the receiver from merged manifests." am:...

[automerger skipped] Merge "Remove the receiver from merged manifests." am: 0095db30 am: 148b74ce am: 49883db4 -s ours am: fafc4b2f -s ours am: 21f6f4ec -s ours

am skip reason: Merged-In I3cd6b846b24be7d18565305f8b4c8ccd13172b13 with SHA-1 bb563770 is already in history

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



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