Merge "Set min_sdk_version" am: e8e5b5bb28 am: 57f6957aea

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1899134

Change-Id: I16db07866b21c8f9388f5eab03fd8930dda7cbb8