[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: 822fc00c am: bd60e3b9 -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: I28cfb87cef897007e9b5b8869c44552472916f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>