[automerger skipped] Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580fd
am: 0050cbc711
am: 789d19af4c
-s ours
am skip reason: Merged-In I488327a01f5e539ecbe315b7016f65084dfd59a1 with SHA-1 658a417205
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605527
Change-Id: Iba95473acdb19fa2f76f0af5ce34753f78e18f3b
This commit is contained in: