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

Change-Id: I215de04fec240441d20e22702b228d35b67811ea