Merge changes Ib1c94642,Ifaba86da into udc-dev am: 6be16cd6b9 am: 39886ac256
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21995964 Change-Id: I9e420c333fd86aee1091ff07cb398906797fbaec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: