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

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

Change-Id: I6f5f218ade24bb60879c04a0eb812e73133b00ca