Merge changes from topic "am-e23540eb30b048079305bd6d5a30d88a" into udc-dev...

Merge changes from topic "am-e23540eb30b048079305bd6d5a30d88a" into udc-dev am: 5f69b55d am: 229e79a8

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



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