Merge "Set min_sdk_version to be part of mainline modules am: 350467da am:...
Merge "Set min_sdk_version to be part of mainline modules am: 350467da am: 1c0c80c1" into rvc-d1-dev-plus-aosp am: babbcc86
Change-Id: I77f1e79abcc8e79a981646b6d0ac3d536edd5418