Merge "ActivityManagerProcessStateTest: wait for focus" into pie-cts-dev am: 517f8cf7b6
am: c9027dbe9d

Change-Id: I1270bbbbbf6ce5b765903f1196fc495197c778ae