Merge "Adding owners in cloudsearch packages" am: d628edb425 am: f921b4b76d

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

Change-Id: I60c619f8c1275b22e069aa256b1569c1efe9eebe