Merge "Revert^2 "Give pom2bp -default-min-sdk-version 24 param"" am: 4572ef27b0

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1666019

Change-Id: Ia119cf244ce933db3ec85298a2935ec8616ee0db