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

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



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