Merge "AAPT2: Record public status in a more robust way" into mnc-dev