Merge "audiomanager: fix orphan focus holder when using ext focus policy" into...

Merge "audiomanager: fix orphan focus holder when using ext focus policy" into main am: 632c8f93 am: ede91dfc

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



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