Merge changes I59db19c5,I49ceeefd,I3e3bc097 into udc-dev am: 8c1b5e57b7 am: 92718fa282
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21554500 Change-Id: I103f7c598c6ada179d9178f3aa952c8ed7604bb3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: