[automerger skipped] Merge changes from topic "ota_for_generic_boot_image" into sc-dev am: 9bbb60e141
am: e77d5844d1
-s ours am: 899466b90c
-s ours
am skip reason: Merged-In I43dd8e206bcd1c9f3f5f51869f126791c50af01a with SHA-1 cb21f9edc8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15289192
Change-Id: Ia820d9508e35bb0a614c839f10e008f69b13e3c3
This commit is contained in: