Merge "Properly sets the display id on Autofill UIs." into udc-dev am: 9b25a61c am: f836f93a

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



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