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

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



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