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

Merge "Revert "Fix erroneous "Field requires API level 33 (current min is 32)" warnings"" am: 99666e27 am: 611f75ea am: 197ec71e am: 64e84894

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



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