Merge "Merge "AAPT: Auto-alias application adaptive-icon" into oc-dev am: 26e1d91939" into oc-dev-plus-aosp