Merge "Adding owners in cloudsearch packages" am: d628edb425

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

Change-Id: Idd4a1c646fbba09032a6b73f332fb0aaa08b14e5