Merge "Remove the receiver from merged manifests." into udc-dev am: 46d68572

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



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