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

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

Change-Id: Ic01983978c42ab3a67e2d1ae114832ba233e95f9