[automerger skipped] Merge "Avoid deadlock during boot up" into rvc-qpr-dev...

[automerger skipped] Merge "Avoid deadlock during boot up" into rvc-qpr-dev am: 486ba92b am: b265a0d3 -s ours

am skip reason: Change-Id Ief47cad91cbbc498179cd38e653bd1fa565cee2e with SHA-1 d9c44734 is in history

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

Change-Id: I556255210878888de8ff58512bb4e190defc74e1