[automerger skipped] Merge "Allow 2-pane deep link to access unexported...

[automerger skipped] Merge "Allow 2-pane deep link to access unexported Activity" into tm-qpr-dev am: e8e2d9c6 am: c743f446 -s ours

am skip reason: Merged-In I662df6cb287361b135e2c596abe946ddeb03bda4 with SHA-1 1a491465 is already in history

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



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