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

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

Change-Id: I09966e302ef05f5d0c044ee39449ca0706363072