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

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



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