Merge "Fix user interaction logging for both fill dialog and save ui." into...

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

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



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