Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." into nyc-mr2-dev
am: 589c217580  -s ours

Change-Id: I35f9b310a83ad4386a5f8910613698d2f1d7e226