Merge changes from topics "delegate-imf", "delegate-view" into udc-dev am: ccf11a08

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



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