Merge "Rollback @SystemApi on ApnSetting"