[automerger skipped] Merge "Correct partition name" into main am: f0af7f26 am: 22260131 -s ours

am skip reason: Merged-In Ie073f7b33843f838a6c66d53b4feb37e213706f4 with SHA-1 3fdf2553 is already in history

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



Change-Id: I8828ef33a3b7bfa9fea2ebcd2bc34106af9407cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>