[automerger skipped] Merge "New trace sections for IKeyguardService" into...

[automerger skipped] Merge "New trace sections for IKeyguardService" into udc-dev am: 863e8cad am: 18bec6b6 -s ours

am skip reason: Merged-In Ib7cf703c9bf45fc0567abe5967bf09e479698b46 with SHA-1 803fc29c is already in history

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



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