automerge: 7109932 * commit '71099329cc0443ce4517480c86f81ed6b4e33ff2': Wi-Fi calling settings cleanup
7109932