[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: 7cab6aca am: 2924162a am: f4771e2e -s ours

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

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

Change-Id: I55459c89429b847f8d887dad64263fc837b76cb9