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

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



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