Merge changes Iebbc5d77,I2bef5f6f into udc-dev am: c6ffe347 am: 2101a1c0 am: 37e6e569 am: c4b7b5de

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



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