Merge "AAPT: Fix feature split generation of ID resources am: 4d219da3c4 am: e69f9ca938" into nyc-mr1-dev-plus-aosp