Merge changes from topic "am-bfc0f89ad1364c2eb68c831484dca5e5" into udc-dev am: fa30988b am: e9e543a4

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



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