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

Change-Id: Ife82cde87fe3135f4c8b8ff4ac9222f3b6e5a7c7