[automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c754 am: 640e337b -s ours

am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8 is already in history

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



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