Merge "Add trace to resync." into udc-dev am: cdcc6f71 am: 2a65e8fb

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



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