Merge "Set min_sdk_version to apex_inherit" am: 31df94e286

Change-Id: Ia19307912b4db7fa70ba3028c931e88b6fda5dc3