tree a957a879cdd6c5a1221b5f7923faa9b33a44e4ac
parent 69a683ff5d2223c892aef94dd075dc1d7e84b188
parent 7cab6acae9b6190ca6c0606a19e2d7e7631c5345
author Riddle Hsu <riddlehsu@google.com> 1594109204 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594109204 +0000

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: Ie114f9cd427d781ed5cfe31f5cbe907075204ac1