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: Icf1b10f00fdfb4532b95658060ab20fe729d90d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>