Merge "Move SettingsLib tests and EasterEgg to aapt2."
am: 846fbd0806

Change-Id: I4d616697988a569b53d0dec1e4b674e455ae1307