[automerger skipped] Merge "New trace sections for IKeyguardService" into udc-dev am: 863e8cad4a am: 96a684e4d3 -s ours am: 13417b6a81 -s ours am: 1c9fb04b86 -s ours
am skip reason: Merged-In Ib7cf703c9bf45fc0567abe5967bf09e479698b46 with SHA-1 138c8a13ea is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23355457
Change-Id: I735688d2807491bb2955602c468b473373121468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: