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

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

Change-Id: I4c24f27c4c182ecc0add98ff64bce4a84df130de