Merge "[aapt2] Ignore annotations in flag/enum attribute values" into main