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

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

Change-Id: I9df9bfccd9bf03de907208e4756816b200358573