Fixes https://github.com/WhisperSystems/Signal-Android/issues/7237 Upstream commit: https://github.com/WhisperSystems/Signal-Android/commit/4cb2ac7b27e7b170a9102af638b98b86e589bc9d