Merge "Set min_sdk_version to be part of mainline modules" am: 8ffe8082e4 am: b692f53739 Change-Id: I18ba4c40e2c9f8d2cb8ce60f39298368f2183e93