Merge "Use AAPT2 For SettingsUnitTests"