Merge "Avoid deadlock during boot up" into rvc-qpr-dev am: 486ba92b4e

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

Change-Id: I760ea39d7635c69c8bee6444585a050a47c8838c