[automerger skipped] Merge "Parcel queriesProviders in ParsingPackageImpl" am:...

[automerger skipped] Merge "Parcel queriesProviders in ParsingPackageImpl" am: 8ee2b99d am: 131084c9 -s ours am: dd053819 -s ours am: 3b9ec373 -s ours

am skip reason: Change-Id I67219fe00c7b92677391fd46305bf0424d74e5f3 with SHA-1 985d7155 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idce3fa8a6f0ad1fd917d3a0497f5f46d823c26df