[automerger skipped] Merge "Revert "Revert "zuma: Enable SICD after boot""" into udc-d1-dev am: 19230e8ea7
-s ours
am skip reason: Merged-In I9bf853c11cb5335306c701d9fd19b4ae72517985 with SHA-1 0493c3a35b
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22713248
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/22775880
Change-Id: I13a52ccbfb9d2aa312f92c58d3ee56b89ba4a831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
96baf25b7d