[automerger skipped] Merge changes from topic "VOIMS_OPT_IN_STATUS" into...

[automerger skipped] Merge changes from topic "VOIMS_OPT_IN_STATUS" into sc-dev am: c27ec61d -s ours

am skip reason: Change-Id I324bfeb30264891fee22af4a96415538f4c07b8a with SHA-1 f1eab0b4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bfc4dd7600886f3f13327086cbfb722e1c5f54e