DO NOT MERGE: Add a recycle map for preference IDs

This causes less ID churn when preferences are removed
and added in a PreferenceGroup, and is indexed by preference
key.

b/26271353

Change-Id: Ie11cdf06fcd815682c258c8985bf1858972d901e
2 files changed