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

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



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