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

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



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