Merge "Clean up hard-coded min_sdk_version/apex_available" am: dca2e077 am: 9493af0e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089583



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