Merge "[flexiglass] Swipe up from shade goes to correct scene." into udc-qpr-dev am: b7f2bf9c

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



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