[automerger skipped] Settings 2-pane deep link vulnerabilities am: 23412ad9...

[automerger skipped] Settings 2-pane deep link vulnerabilities am: 23412ad9 -s ours am: 97fdb8a7 -s ours

am skip reason: Merged-In I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f with SHA-1 fef9b974 is already in history

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



Change-Id: Ifaace91bc41f214098a56d65df964e54cfbbbc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>