[automerger skipped] Merge "Don't change the voice interactor setting if it's...

[automerger skipped] Merge "Don't change the voice interactor setting if it's explicitly unset." into rvc-qpr-dev am: 8b6f7f10 am: aba4253c -s ours

am skip reason: Change-Id Ibc2c1675f8b026f2915c3faf55e8ff3c52e1ee32 with SHA-1 c962a1ac is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14bc69bbab68b66f1922434b0736b25b9dc7e74e