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

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

Change-Id: I4ffb57f4ac3eac2ac1a3de2713d38e2bd3e94874