Merge "Adding owners in smartspace packages" am: 10603d5102 am: 6bef558283 am: 5a53f7c676

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ideffda52245794487ac6289f4046b88aab941e93