[automerger skipped] Merge "Add flag to globally override updateable apexes'...

[automerger skipped] Merge "Add flag to globally override updateable apexes' min_sdk_version" am: 7366fcbc am: e84e7041 am: 28c7f408 -s ours am: edaea158 -s ours

am skip reason: Merged-In I8edf09ca3c91ee52e9c2138c71d9b155b4448f66 with SHA-1 b42ddf95 is already in history

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



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