Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1 am: 5f5bcf56ca am: 6b6287111f

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

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