Hooked-up options menu closing

Options menus weren't closing properly from menu-key (with
CascadingMenuPopup) or from Activity.closeOptionsMenu

Bug: 36398283
Test: Added CTS tests: app.ToolbarActionBarTest and
      app.ActionBarTest#{testOptionsMenuKey, testOpenOptionsMenu}

Change-Id: I89f8ed249b505f369a85b899ca7c1b36c863f0c0