[automerger skipped] Set min_sdk_version to be part of mainline modules am: e8d70076de am: 3fc114c0c7 am: e35ceba888 am: bb5a9f7a4c -s ours

am skip reason: Change-Id I6cfff21dcaf861392f8b69d97195831cdda4c1be with SHA-1 e8d70076de is in history

Change-Id: I1c2b7b3016cd2c174aaabbffcf020757c07cc8bc