[automerger skipped] Set min_sdk_version to be part of mainline modules am: 1d42a459b2 am: e59897af49 am: 2822c44a30 -s ours am: 677cd7495d -s ours

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

Change-Id: Ib433b0cefc6ca34b93891c668426cf3f0a68d618