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

[automerger skipped] Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev am: 252bf820 -s ours am: fb7ff5c7 -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: Iab5eaa1e94b58aadc38244d926709ad3080dd24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>