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

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

Change-Id: Ibbe6aadfb24dd515e2cc4608527c855d66e54269