[automerger skipped] Merge "Revert "audio policy: fix sensor privacy...

[automerger skipped] Merge "Revert "audio policy: fix sensor privacy listener"" into tm-dev am: b8435ce4 am: ebccf32e am: ce238dd4 am: 0611930f -s ours

am skip reason: Merged-In I1178a15583596cd025d5cb1e424f9fe3bf7854b4 with SHA-1 35cd793f is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/20581089

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



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