Merge "Fix user interaction logging for both fill dialog and save ui." into udc-dev am: cf918bef

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



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