[automerger skipped] Set min_sdk_version to be part of mainline modules am: 2a305a3bed -s ours

am skip reason: Change-Id Iadf898297c1ada784a65099bdf96c944833cdb09 with SHA-1 4e825b97f2 is in history

Change-Id: Ic58b9eb1fd1a01bb888349cc569d29007908544e