Merge changes I7fcac406,I7f11c26e into udc-dev am: f9d4ab8a am: dee90873

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



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