Merge "Fix some additional tests registering real receivers" into udc-dev am: 5be8ccc6

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



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