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

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

Change-Id: Ia1534082a468d2e15c127cf0ffc5ea2ffeb2ee86