[automerger skipped] Merge "CloudSearch API: changes two key names and adds...

[automerger skipped] Merge "CloudSearch API: changes two key names and adds two keys for app pkg name and install count in ExtraInfo" into tm-dev am: 20561868 -s ours

am skip reason: Merged-In Ib7066bcb37618c4e5d751cd0eb0bc1d265831427 with SHA-1 0b6c8f75 is already in history

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

Change-Id: Ie0b94b6b48c09ab9216dc2e15e3c1167d339ddc2