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

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



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