Merge "Add  QUERY_ALL_PACKAGES permission to VpnDialogs" am: 68b50f127f am: 5f51e2462e am: ff9bf0ca97 am: f58bf7e5ee

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

Change-Id: I38cbd270ad42ab54235bc8bd6f18ba0f4ec45779