Ignore-AOSP-First: Dependent on internal change.
Bug: b/205760172
Test: Run confirmation UI test using CTS Verifier
Change-Id: I690f6eb49f47bdf2d2790b0a6c9b0c45ca819a31
(cherry picked from commit 2acd1c0e73)
Merged-In: I690f6eb49f47bdf2d2790b0a6c9b0c45ca819a31