Guard against crashes from data saver listeners

Change-Id: I85b127c38cc61ec6928aefbf323430051028fafc
Fixes: 28065072
1 file changed