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

Change-Id: Ifa6717fb8ecee65554e7af27c13f8aeef3bb002c