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

Change-Id: Ib7eb158b33abfa09517d3bc77ceb9ee0f0d8d035