Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." am: 7f9ed1cd85 -s ours am: 3bfa2451d4 -s ours
am: cbd6fb206d -s ours
Change-Id: I2bf7915661d8eae1fab75d4941c2e898bce2544d
This commit is contained in: