Merge changes from topic "tc_change_23031706_14" into udc-dev am: fc7914f3

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



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