Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5 am: 2b3dbdd95b am: d0c69c2298 am: fd9b35d4de am: 8521eb44b1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810683

Change-Id: Ia938dc0d825cc786e47071aeca9af399b0533acc