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

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

Change-Id: Ib6b1ad6aca0c6531285ae296cdcdfc7b1163dad5