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

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

Change-Id: Ie569e3a9ef8000d1251333bba214e53a0943a08a