Merge changes I7cc11e08,Ia2afd2e4 into udc-dev am: a940068d am: b176c62d...

Merge changes I7cc11e08,Ia2afd2e4 into udc-dev am: a940068d am: b176c62d am: 17b3d325 am: 17c1210b

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



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