Merge "Ensure that ActionBarActivity has focus before running MenuKey test." into oreo-cts-dev am: d680f0f4cc am: fa0ac0124e am: 667d6d7e9d am: 3ec955ed3a
am: 58343b9013

Change-Id: I521ec26d340a30cf216b7ed88fa3495dc4ebd2f4