Merge "Set min_sdk_version to be part of mainline modules" am: 78335d9eda am: 3575027a37 am: 994cf10327

Change-Id: I617ac436cf0b4720c867d3f73cfafa484621deb4