Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I811bbe7d8b1ab864f8af45a60b8e1a919dc08013