Merge "Don't wakeup from the pickup gesture when kg is occluded" into...

Merge "Don't wakeup from the pickup gesture when kg is occluded" into sc-qpr1-dev am: 04c515b8 am: ab61a7c3

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

Change-Id: I466f0bba2a71039b6321b81bff66363a0337a20c