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

Change-Id: I537e815e7b3ead2f31e8031642f6e8583028b0e0