Merge changes Ie865aba7,Ic51a9ceb into udc-dev am: 85b959f4 am: da088f2e am: 2f91a8d3

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



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