Consolidate showing dialog logic.

This is a follow-up cl for ag/1930689 to clean up logic variants.

Bug: 34055055
Test: Manual test on a local build.
Change-Id: I966584fbdd1668640d13c785da216c80bafb49d8