[automerger skipped] Merge "Allow swipe up on unlocked dream." into tm-qpr-dev am: 5ef8b6f81c am: 9148832531 -s ours
am skip reason: Merged-In Ia3d6df9459989f003fad444ff08148666cefc042 with SHA-1 fc12f29e63 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21061907
Change-Id: I115c9c2f7d394fd555fa33cf90313f615d9953b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: