Merge changes from topic "am-de83791faf2847408cc234802216d255" into udc-d1-dev-plus-aosp am: f26946c4

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



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