[automerger skipped] Merge "Support Settings deep links highlighting the menu...

[automerger skipped] Merge "Support Settings deep links highlighting the menu entries" into sc-v2-dev am: 22ff8c78 -s ours

am skip reason: Merged-In I2249d4779d69bc0934b9c57900b903638ad6700b with SHA-1 7b64761b is already in history

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

Change-Id: I2b8fde77acefc3f6de21f326b0dda764b5d80dd0