Merge "Adds owners to shortcuts related classes in framework" am: ba6f395188 am: 76bcea6550 am: 4d92751539 am: 4268bece0c

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

Change-Id: Iadf99bde3b5ccca5a1632a48877647571457b7fb