Merge changes Ib0d4169d,I6817e517 into udc-dev am: 55a94bec24 am: c8dc05b622
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23056460 Change-Id: If97e2799c20a9a171cb374e608e964436e0a1781 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: