Merge "update owner for shortcut related test cases" am: ff07d10d am: b560df12 am: 74271548

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib629b87d9988229163d2df5e93e92f22b47a7cc6