[automerger skipped] Merge "Set min_sdk_version to be part of mainline modules" am: 99af8ee7a9 am: 9fe096ad55 -s ours

am skip reason: Change-Id Ib53d23a26ecebca4abcebedc4d4ba7cecc2119cb with SHA-1 459aacf942 is in history

Change-Id: I2fa54594714f7ee8fc5010445a85bea8656fefc0