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

[automerger skipped] Merge "Remove the receiver from merged manifests." into udc-dev am: 46d68572 am: 4ad6405d -s ours

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

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



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