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