Merge changes I77443a8b,I894b36c6 into udc-dev am: c5943960d8 am: ff5d7b76f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21514790 Change-Id: Id9eb8db9e3016fee400ece2cfa2dea2220c61712 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: