Merge "Log custom lockscreen shortcuts" into udc-dev am: 82472631 am: ef454a51

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



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