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