Merge changes I5309c225,Id706da34 into udc-dev am: 17b2bb996f am: 9017cd30f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21750181 Change-Id: I1b0be6752d66c1a93c61c348840c8c14bcdadabb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: