[automerger skipped] Merge "Update support library modules to contain min_sdk_version" am: 5070312266  -s ours am: 93c196ffd0  -s ours
am: 07cebff1d6  -s ours

Change-Id: I76b06fb15b68af94ad6bef1ecb0ec38ae93afb69