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

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



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