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

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

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



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