[automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7 am:...

[automerger skipped] [MEP] psim's logical slot index is 0 am: 2479c9f7 am: 83311b62 am: bca382ee -s ours am: f137d36e -s ours

am skip reason: Merged-In I1588bd4a2f552a6b41844883b6ad50f1bfec95de with SHA-1 0b948c82 is already in history

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



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