[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "KEY_DATA_SWITCH_VALIDATION_MIN_GAP_MILLIS_LONG", "smsvc_bootup" am: 0cf4b000 am: 3350a7f3 am: 12687c3b -s ours am: c3f0f170 -s ours

am skip reason: Merged-In Ic3c2cd6ae21ec5199637d609c20d361b17de0726 with SHA-1 ad5058dc is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2519538



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