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 am: db72130e

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

Change-Id: I6ff977828201e123b6faf36a8c72c00659db6e1b