Merge changes from topic "am-ca006b49c781433a98b70cd175d5cbd7" into udc-dev am: 3ea6b91c am: c31ef7d2 am: 341d143f am: b993e067

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



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