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

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

Change-Id: Icad25036f76c947dcc84fdede3a8be1a4afbc5fd