[automerger skipped] Merge "CloudSearch API: adds two keys for app intents in ExtraInfo" into tm-dev am: 8fe47c1c am: 875ca05e -s ours

am skip reason: Merged-In If2f83f35ff5418086d55fd9799b4586883d955eb with SHA-1 ad360977 is already in history

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

Change-Id: I14c1c451a1e4440043f0f91a60178f751d8c05a1