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

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

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

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



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