Merge "Add missing fields to ApnSetting#toContentValues" into udc-dev