[automerger skipped] Merge "Add new provisioning flag for VOIMS opt-in" into...

[automerger skipped] Merge "Add new provisioning flag for VOIMS opt-in" into sc-dev am: c74f9c26 -s ours

am skip reason: Change-Id I0b8af8fe6c9a34a56f9e2275df0a03ba093f439e with SHA-1 7afe5e9c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13475179

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5df876644bb0392d8bfd7c0d2c28cd72963c3b8d