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

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

Change-Id: I1f429e9506dc522cc29d3b4ecba8b33d6982eb55