DO NOT MERGE Chk QUERY_ALL_PACKAGES when resolving am: 6628f4e7b8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie471324b1bec6fea195e35f61158a877a82e0bb0