Merge changes from topic "tc_change_23022712_26" into udc-dev am: cb44abff

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606457



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