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

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



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