Merge "Set min_sdk_version to be part of mainline modules" am: 7888400011

Original change: undetermined

Change-Id: I04375a952411b493fa1139ffaede3f9d0480bb5b