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

Change-Id: I91e58f99a48b37512570a027976193d0e41f1ab9