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

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

Change-Id: Ia6b5a748450e88bac3b356013d8ac410a8af7bb3