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 am: 8e5f13e1

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



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