[automerger skipped] Merge "Merge "Don't wakeup from the pickup gesture when...

[automerger skipped] Merge "Merge "Don't wakeup from the pickup gesture when kg is occluded" into sc-qpr1-dev am: 04c515b8" into sc-v2-dev am: 7cf67680 -s ours

am skip reason: Merged-In I9856571e104ef05aec93d32056cd2097c2d2a1da with SHA-1 cb01b247 is already in history

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

Change-Id: I1e45dbba9a377db7fe62a3b89c2226b6cce1847e