[automerger skipped] Merge "Remove the receiver from merged manifests." am: 0095db3026 am: 148b74ce04 am: 49883db414 -s ours
am skip reason: Merged-In I3cd6b846b24be7d18565305f8b4c8ccd13172b13 with SHA-1 bb563770e6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2506624
Change-Id: Ie15178b45f417a8cac03b535a3755ee3bce7fa5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: