Merge "Set min_sdk_version to be part of mainline modules am: f11c3bb0f1 am: c62b2c33bb am: 999f3e21f5" into rvc-qpr-dev-plus-aosp