[automerger skipped] Merge "Fix boot timeout and reduce boot time" into...

[automerger skipped] Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313 am: 60c730b6 -s ours am: 5fb4b246 -s ours am: 4f77e0f0 -s ours

am skip reason: Change-Id I2f979055e89ae5e40af05e469741bb89e2e24ce6 with SHA-1 29bfa727 is in history

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

Change-Id: I85accc1999292f510571affecd9e594ac629cdae