[automerger skipped] Merge "Missing required packages for f2fs when building ota package" into sc-dev am: 6279b6c5 am: 7e5a0011 -s ours

am skip reason: Merged-In Ib2ecc0cf88d71f358bd04e6c4ac129607fe4054c with SHA-1 01da65f9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14910115

Change-Id: I5c06cf3da1c520b4de9cc9d678f86b17bb2be077