Merge changes I399e82b7,Ie399c733 into udc-dev am: 19f86ea6a4 am: e39203d6e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21751480 Change-Id: I8a4ec6587be4247d21ccb50b633fff645aac3704 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: