[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: 0b3b56bc -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: I78564c58c10827ff70f03c7813bf07d13bb228ef