Merge changes from topic "autofill-pcc-metrics" into udc-dev am: 5c04a55e59 am: 81eb7255ea

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

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