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

[automerger skipped] CloudSearch API: changes two key names and adds two keys for app pkg name and install count in ExtraInfo am: e3b56a60 -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: Iffa39007231e921c3f2170ac3956b02f905cbc00