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

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



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