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