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

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

Change-Id: I23bf705492442c44448c77d439b656fbdc117ac5