Merge "configure owners for ShortcutInfo" am: 694df14654 am: 2948fb99c5 am: e6d38e61cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5877f9fc510c553e3299d1e33fc3ec4f2d74137