Merge changes from topic "am-ca006b49c781433a98b70cd175d5cbd7" into udc-dev am: 3ea6b91c am: 33cffb0d

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



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