Merge changes I339886d1,Id53bfc8c into udc-dev am: 7f4445dfd1 am: d9accf3c08 am: 37f77c7962
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23242775 Change-Id: I6678015dcdaf619f4cf489b52805a48b652fbe0b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: