Merge changes Icb7ba7d1,If6d5e6ec into udc-dev am: 8b616a88ab

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

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