Merge "Don't send lock icon touches to NotifShade" into sc-v2-dev am: 12aff06413 am: 9d7958a97e

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

Change-Id: I584b0643dec94ac20cf5bb997250ebe2e4d447ff