[automerger skipped] Merge "Merge "Allow swipe up on unlocked dream." into...

[automerger skipped] Merge "Merge "Allow swipe up on unlocked dream." into tm-qpr-dev am: 5ef8b6f8" into tm-qpr-dev-plus-aosp am: f9ce7f7c -s ours

am skip reason: Merged-In Ia3d6df9459989f003fad444ff08148666cefc042 with SHA-1 fc12f29e is already in history

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



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