[automerger skipped] Merge "Don't hold clients lock while initializing...

[automerger skipped] Merge "Don't hold clients lock while initializing Ringtone." into udc-dev am: 16ebd981 am: 853876b0 am: 25401951 -s ours

am skip reason: Merged-In Ic1b753cde9afc6536d137618df54c21eec38487a with SHA-1 108385e1 is already in history

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



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