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

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

Change-Id: I00abef71c6ee92e4509d92d0ab1f8da7d42ad747