Merge "Set min_sdk_version to apex_inherit" am: 31df94e286 am: 4e7065d53b

Change-Id: I4619398d64d6dc8dd601ae9f80e67ce4dd503e65