Merge "Collapse the overflow view when swiping back" into udc-qpr-dev am: 889d4e08 am: 81a32e33

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



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