Merge "Allow APEXes permission XMLs to declare features." am: ada5fb65b5

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

Change-Id: I2385e0b45e15f204382ec5eeee24ce3d62b17064