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: e7de6181 am: f934931d

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

Change-Id: Iedd6c0e50743b4b5991607728cd5ed5601502c5b