Merge changes I81bda912,I5ed93786 into udc-dev am: 9ccb30e3ae am: ee7697fe0c am: 3f9219518d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23154100 Change-Id: I6ea89b0657cb20fc3d196420f2ce6c8bbc64f519 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: