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: I9e00ad9c654ce922cd3d10803eabc71b0b6f37c1