Merge "Merge "Fix ActionBarTest for KEY_MENU with permanent menu key." into oreo-cts-dev am: 4b1644bf" into oreo-mr1-cts-dev