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

Change-Id: I38bc7082bda223aea07ae08468f996a06da243a6