[automerger skipped] Minor flagging cleanup am: 51cee24d -s ours

am skip reason: Merged-In I6b1d6dcd0aff3c82551021b3f4768a34f27d6fb2 with SHA-1 52df388f is already in history

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



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