DO NOT MERGE - Unify the recovery UI.

Bug: 147146197
Test: build
Change-Id: I5e1392b1de903cd19c84535b1536ed2dfe9d0ed2
1 file changed