Merge "Add missing log parameters and fix the ordering." into udc-dev am: c4d4992a am: 3473fa85

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



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