Merge changes I98336ac6,If48f80a0 into udc-dev am: 3217999c

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



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