Merge changes from topic "tc_change_23041807_28" into udc-dev am: 16c993d0c2 am: b8279b8b35

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

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