Merge "Ensure the manage menu is closed when the stack collapses" into...

Merge "Ensure the manage menu is closed when the stack collapses" into tm-qpr-dev am: 41d68f0c am: e42c4e54

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



Change-Id: I9807d7706a2471515273a743122784ab5650cff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>