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

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

Change-Id: Ia18605f157581a2c1baf9d2fabac9f8f0631243e