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

Change-Id: Iff99c366e4759dad3a29fbff78f8915c7647c766