Merge "ActivityManagerProcessStateTest: wait for focus" into pie-cts-dev