Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313c9 am: 7cab6acae9 am: 03b0c47b66

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

Change-Id: Ibbc4841fb268c8c8a75a740abbff5f169fbd02d6