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

[automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b974 -s ours am: 7c1b4588 -s ours

am skip reason: skipped by user arcwang

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



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