Merge "Update SHORTCUT_OWNERS to ensure future bugs will be routed in correct order." am: 10fc99d0b8 am: b625f5a1d5

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

Change-Id: I12ea26420e292ce069fc1db71be604bbba3bc7de