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: ba75ebc4 am: 23462d5a

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



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