Merge changes Icb7ba7d1,If6d5e6ec into udc-dev am: 8b616a88 am: de9a2b93 am: 511e82fa am: b685dae1

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



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