[automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into...

[automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-dev am: 7aade1ac -s ours am: 06b7aa47 -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/+/20581119



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