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

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



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