Merge "Ensure that ActionBarActivity has focus before running MenuKey test." into oreo-cts-dev am: d680f0f4cc am: 77a8068044 am: 35b976b144
am: 251c80c66f

Change-Id: Id023519422c6ce9bf8592ff42779233eeb95eaff