Merge "Log system keys and shortcuts" into udc-qpr-dev am: 872d54fb am: e86556dc

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



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