[automerger skipped] Set min_sdk_version to be part of mainline modules am: 3c3f271211 -s ours am: 6720519367 -s ours

am skip reason: Change-Id I6e251b193a1ee4dc868b17a67b0d730ecd678d8b with SHA-1 3c3f271211 is in history

Change-Id: Icb124a2e7e252ddd3637ec53736dca84c4d8a9f5