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

Change-Id: Id4fad73cf4ea66203711c19696289a06c5793012