Merge "[Settings] Additional route for dismiss activity dialog" into...

Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev am: 105cda2f am: 534dbdfd

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



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