Merge changes from topic "am-afb14a54e2b948ecbed0920c789042bd" into udc-dev am: 45ae27ce am: 6bbbfefa

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



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