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

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



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