Merge "tests: Use FRIEND_TEST in ScreenRecoveryUITest."
am: 4ba20f1031

Change-Id: Iac05758ba00aa6fb05d18427642d198e602be7b3