Merge "Prevent media button receivers targeting activities" into udc-dev am:...

Merge "Prevent media button receivers targeting activities" into udc-dev am: fe79cdd8 am: ce5cba3c

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



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