Merge "Merge "Ensure that ActionBarActivity has focus before running MenuKey test." into oreo-cts-dev am: d680f0f4cc am: fa0ac0124e" into oc-dr1-dev
am: a6d9750ea5

Change-Id: Ib50a2b160f3b31def062a7d05432e8157245b55f