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