[automerger skipped] Merge 10952656 am: 596efc7e -s ours am: 0c4f756b -s ours

am skip reason: Merged-In Ib02ae9caef06a46938947806dac8aabb1fa12d94 with SHA-1 8319a775 is already in history

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



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