Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr1-dev
am: 8c0b46c420  -s ours

Change-Id: I8ea512917dd5929b41546a5523bcbe055b683cea