Merge changes Ie865aba7,Ic51a9ceb into udc-dev am: 85b959f478

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

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