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

Change-Id: I8ff614e841d48c9e6defa4d6bfcee427e5c0ec85