Merge "Fix discovered logging issues for Autofill." into udc-dev am: 691b6c29 am: a742fbc6

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



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