[automerger skipped] Set min_sdk_version to be part of mainline modules am: e8d70076de -s ours am: 9b285bc9f5 -s ours

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

Change-Id: I36bf11875dc6ffc23e6d1e5db03f2a473577f66b