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

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

Change-Id: I21e8592ff96da1c48abce34c0147e13f9b27b49e