[automerger skipped] Merge "Disable Reset app preference during the call." into main am: f7631498f1 am: 962cd2e8d8 -s ours
am skip reason: Merged-In If64b6c878b2f793c6852d000d9d90dda18ef2420 with SHA-1 c6544f991f is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3498088
Change-Id: I5ac4632bfd1cd6debad5beb1be88828ccfc63941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: