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

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



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