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: Ief4a94f45bd2c7198b738a85774841d4176078e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>