Merge "AudioService: make sure intents are received by AudioService before 3p...

Merge "AudioService: make sure intents are received by AudioService before 3p apps" into udc-dev am: 1b4028c4 am: 39c6dc32

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



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