[automerger skipped] Merge "New trace sections for IKeyguardService" into udc-dev am: 863e8cad4a am: d681c73a28 am: 0af0d988f8 -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: Ie6e9ec32eb725712e273f3b6ab37d3291486a93f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: