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

Merge "Add missing log parameters and fix the ordering." into udc-dev am: c4d4992a am: 7a588de2 am: 4651efb3

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



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