Merge "Fix standalone action mode not respecting app:showAsAction" into mnc-ub-dev
am: 9595c2d

* commit '9595c2d08da48a6a26f9b68d624b6a910fad4857':
  Fix standalone action mode not respecting app:showAsAction

Change-Id: Ia0fb4b2568a0a50bb005e0d5eafd8f0b3b08e963