Merge "Workaround to display menus for AppCompat themes" into nyc-dev
am: 36cd747bb6

* commit '36cd747bb6030c9c19dbab6bdfd85b2106017973':
  Workaround to display menus for AppCompat themes

Change-Id: I5af2f38a8c470c5aca89e91b951c45f7ae91ed3b