Merge "Remove the receiver from merged manifests." am: 0095db3026

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

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