Merge changes from topics "VOIMS_OPT_IN", "d2d" am: 9685e67dc0 am: 9d8416884f

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1689636

Change-Id: Iff5ede07f7c4e5bea732d986c85ff4f7f2e12995