Merge "Fix erroneous "Field requires API level 33 (current min is 32)"...

Merge "Fix erroneous "Field requires API level 33 (current min is 32)" warnings" am: fcf0b686 am: 587f8c34 am: 35e51793

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



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