Merge changes I8d360d47,Iebf877d8 into udc-dev am: 3527ffe7f4

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

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