[automerger skipped] Merge "[Settings] Additional route for dismiss activity...

[automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa -s ours am: d38d75bc -s ours

am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde7 is already in history

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



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