Merge "[automerger skipped] Set min_sdk_version to be part of mainline modules am: 1d42a459b2 am: e59897af49 -s ours am: 7aba9c37e1 -s ours" into rvc-qpr-dev-plus-aosp am: 14a7aa2abf -s ours

am skip reason: Change-Id I90e135617642c87ecff517a17120285d8355827e with SHA-1 1d42a459b2 is in history

Change-Id: Ife2c619200fea52c302232a74f56a421071de5d0