[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-plus-aosp am: 6cf6f846 -s ours

am skip reason: Merged-In I2249d4779d69bc0934b9c57900b903638ad6700b with SHA-1 646a31e8 is already in history

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

Change-Id: I8626c32342f7e7ed30e6a567800444867c566f66