[automerger skipped] 16kb: Set data partition to f2fs for 16kb aosp caimito targets only am: 31c8cd5a13 -s ours

am skip reason: Merged-In I40b8bb180ae9b23965ab379a63825542c121adde with SHA-1 0bf4e1ec54 is already in history

Original change: https://android-review.googlesource.com/c/device/google/caimito/+/3395426

Change-Id: I37bce12c8f99d1c7d46ef1bcc62d88510cc034eb
Signed-off-by: Automerger Merge Worker <[email protected]>