Merge changes Icb7ba7d1,If6d5e6ec into udc-dev am: 8b616a88 am: de9a2b93 am: 595c3762 am: 4ecbb82e

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



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