Merge "Fix dumping empty queriesPackages" into tm-dev am: dbd5719b am: 2e7d0bd1 am: dfc7dbdb am: eed2f239

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



Change-Id: Ifb3745f5d2a4cbed7493a2b61e8ea775fb5e39a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>