[automerger skipped] Merge "[Provider Model] Correct the Settings shortcut of...

[automerger skipped] Merge "[Provider Model] Correct the Settings shortcut of the Settings Widget" into sc-qpr1-dev am: eef01580 am: a327c5ba -s ours am: 9fbd0387 -s ours

am skip reason: Merged-In I488327a01f5e539ecbe315b7016f65084dfd59a1 with SHA-1 c7c7a813 is already in history

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

Change-Id: I3dda373c3511e7d63c4bc389b8d3700445804921