Merge "tests: Skip ScreenRecoveryUITest on gr_init failure." am: c53639d5e3 am: c7b4418a80
am: fb3b3e4031

Change-Id: Ibb9ab1541f701f839e9511d83cc0c53ef91043b5