Merge "Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug"...

Merge "Revise minSdkVersion to fix failed mainline_modules_bundles-userdebug" into main am: 8e1baff3 am: c28a6572 am: c8669769 am: 6e021804

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



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