Merge "Add <staging-public-group-final> to aapt2" into sc-dev