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

[automerger skipped] Merge "Merge "Fix boot timeout and reduce boot time" into rvc-dev am: 2d695313 am: 7cab6aca am: 03b0c47b" into rvc-qpr-dev-plus-aosp am: 0b97dc6b -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: I9c3514cacce485ccc7291d75fd0b15ede82cfb0f