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

* commit '247bc95cb31c6f7e56814818dc29aa1eb8512e6c':
  AAPT2: Record public status in a more robust way