Merge changes from topic "am-5f5f9de6a0fd41109dce3621aef627f4" into udc-dev am: dc895f24

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



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