[automerger skipped] Merge "Revert "Enable bootstrap if warranty sku is set"" into 24D1-dev am: 249b80a495
-s ours
am skip reason: Merged-In I9b884b869981fe37a4f2438616cd6a51c86f6358 with SHA-1 d544ae37c0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/27828778
Change-Id: I4864ec6b923f691826559092d4215d6f7b7c15e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
06bc0ad81a