DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
am: 20488d97cd  -s ours

Change-Id: I2fa0208006c527af2c2b5c06b2d907dadfac22e5