Merge changes from topic "audio_appop_refcount_tm" into tm-dev am: e5c72065...

Merge changes from topic "audio_appop_refcount_tm" into tm-dev am: e5c72065 am: 8bfa0921 am: d75ad451 am: c3e0c5b4 am: 67f1ce92

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



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