Merge changes from topic "audio_appop_refcount_udc" into udc-dev am:...

Merge changes from topic "audio_appop_refcount_udc" into udc-dev am: fe1166e0 am: 9b2ef799 am: 216a145e

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



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