Merge "Only resize the menu on hide if it was resized on show" into sc-dev am:...

Merge "Only resize the menu on hide if it was resized on show" into sc-dev am: 46e2f597 am: 664b77f5 am: e4a8ed94

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14649851

Change-Id: Ia3fea952a987c31a9c186c2286d7db96d4ac7954