Merge "Merge changes I7c3a44cf,Iba8138d8 into udc-dev am: 33b6a657 am:...

Merge "Merge changes I7c3a44cf,Iba8138d8 into udc-dev am: 33b6a657 am: 04d5ce46" into udc-d1-dev-plus-aosp am: b0e44ad3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22854606



Change-Id: I1e5c84f3f9ef3fbf8897c531c57a651b7d7e36fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>