Merge "Change dictionary results to use a bundle instead since it is a...

Merge "Change dictionary results to use a bundle instead since it is a structured result." into sc-dev am: c1b7cc6a

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

Change-Id: I7f25230bea1391e96a410eb6be945436402171d0