Merge changes from topic "am-6617f9bfee724a928e222b3aa47ebc25" into udc-dev am: f2e511b3 am: e2ad5779

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



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