Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." am: 7f9ed1cd85  -s ours
am: 3bfa2451d4  -s ours

Change-Id: I4189d9ac8315cee7d8ac9618f11c84b82fae4caa