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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9670927375fa2cbb52a8d7114b41d9475dcc7b7e