Merge "Merge changes I7f59d2a1,I9fc39c85,I8ba8af41 into udc-dev am: 76f56a4e...

Merge "Merge changes I7f59d2a1,I9fc39c85,I8ba8af41 into udc-dev am: 76f56a4e am: 48046513" into udc-d1-dev-plus-aosp am: c526ca83

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



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