Merge "Send user-activity to power manager on lock icon long press" into...

Merge "Send user-activity to power manager on lock icon long press" into udc-dev am: cdf40883 am: 3a686450

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



Change-Id: I92bb433db93495e7f54e645b000129d582ec7c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>