Merge changes Ib132c1e2,I2115f086 into udc-dev am: f9a90ca984 am: 496fdfa983
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21939399 Change-Id: I7fb03d0f2544eb1bdf1da92b6a13548d7cf03627 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: