Bug: 193059742 Bug: 194013709 Test: build, aapt dump badging generated apex Ignore-AOSP-First: Change intended for Android S and downstream branches Change-Id: I93cfd56978583b03f56070112be896812fe737ef Merged-In: Ib8905a641780bed490a38327facee4a76e7770a3