Merge "Fix dumping empty queriesPackages" into tm-dev am: dbd5719b68 am: 2e7d0bd1f4 am: 6eb599ba23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178886 Change-Id: If3de6f72d0ec772994606e668f04f6737ed64362 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: