Merge "Adds owners to shortcuts related classes in framework" am: ba6f395188

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

Change-Id: I09b88efdce335f6a7e290c8c9a9ebc84de9fbd6e