[automerger skipped] Merge "Add permission QUERY_ALL_PACKAGES into...

[automerger skipped] Merge "Add permission QUERY_ALL_PACKAGES into WAPPushManager" am: 059739f3 am: 612715db am: 3731386a am: 4bfe8d87 -s ours

am skip reason: Change-Id I931c5a7c5e9c5ee3fd72fa2c0a29df48073fd90c with SHA-1 647d9fb7 is in history

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

Change-Id: Idc83f51ddd8c2c3eaae64202d71c59e69560622a