[automerger skipped] Merge "Support get/set voims_opt_in_status in ImsManager"...

[automerger skipped] Merge "Support get/set voims_opt_in_status in ImsManager" am: 26b1e963 am: 65043787 am: 9eb74c39 -s ours am: c21d8565 -s ours

am skip reason: Merged-In Ic94a382f301b3652b51fa3b024ce480836fef106 with SHA-1 d1a8d320 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1688247

Change-Id: I751e88e67ac8b3f747306dc584daaa8969a9b02c