Merge "Fix flaky failures when re-registering AudioPolicy." into udc-dev am: 92ad02c4

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



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