Merge changes Idd362f88,Ifb1e1266 into udc-dev am: 6a61949291 am: 4fcf6af12a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22498482 Change-Id: I6c54f902ac2e7bd3da4d9be2a20e3a6ce75537e6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: