[automerger skipped] Merge changes from topics "VOIMS_OPT_IN", "d2d" am:...

[automerger skipped] Merge changes from topics "VOIMS_OPT_IN", "d2d" am: 4e665fde am: 34fb42d1 am: d1aed289 -s ours am: 6056517d -s ours am: fe1e6f4d -s ours

am skip reason: Merged-In I0263030b03c3f5de845a9565b03fc701c1f581aa with SHA-1 d80d854a is already in history

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

Change-Id: I2c8095f7d0de0b889aa1491cd2e4cae74c617c4c