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

[automerger skipped] Merge "New trace sections for IKeyguardService" into udc-dev am: 863e8cad am: 96a684e4 -s ours am: b91a1b88 -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: I94bef5c06d90ec2dbac9346a901d0c2159402bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>