Merge "Fix concurrency logging." into udc-dev am: 13c49d38

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



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