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

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

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



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