Merge "Make apex_available to com.android.extservices explicit." into main