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

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

Change-Id: Id1e4ac300e6cd25369a092285fc28d0576e0d96c