Merge changes I399e82b7,Ie399c733 into udc-dev am: 19f86ea6

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



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