Merge "Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff am: cc2652c5e9 am: 72f55ee81c" into rvc-qpr-dev-plus-aosp am: 4097433543 am: 9559196cc1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526 Change-Id: I23f35750ba6f2b36c44b0a91273a72c2d5dce9ca
This commit is contained in: