Merge "Fix init watchdog timeout due to a held lock" into udc-qpr-dev am: 6a827552

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



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