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

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



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