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

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



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