Merge "Change MaskableIconDrawable to AdaptiveIconDrawable"

api/current.txt

api/system-current.txt

api/test-current.txt

core/java/android/content/pm/LauncherApps.java

core/res/res/values/attrs.xml

core/res/res/values/config.xml

.../java/android/graphics/drawable/AdaptiveIconDrawable.java

...hics/java/android/graphics/drawable/DrawableInflater.java

graphics/java/android/graphics/drawable/Icon.java

...graphicstests/src/android/graphics/drawable/IconTest.java

...tests/src/com/android/server/pm/ShortcutManagerTest1.java