Merge changes from topic "am-bc0f5b1e049c4551981e48bace3fae31" into udc-dev am: 15b34f04 -s ours

am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be is already in history

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



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