Merge "Set min_sdk_version to be part of mainline modules" into rvc-dev am: 72c3e0bbf6 am: afbd16449d

Change-Id: If5341a7ffd06252612602ea5d53b2b4a36cf4814