Merge "Merge "Remove activity name from autofill metrics logger." into sc-dev am: c254f87c am: ce8abd82" into sc-v2-dev-plus-aosp am: 2ac3ddff

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

Change-Id: I5ebf22213f3db5d721c81b3f9f73b417af769369