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

Change-Id: Id6daee5de0684c6144858d8a15ab57b8e1676e9b