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

Change-Id: I49aadf59e7f086ab39ff28a932233052c2a16487