Merge changes from topic "am-f41ce26583ca44729c5d6c2e1dcadaae" into udc-dev am: 8e657867 am: a2029b9c

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



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