am d3927bd0: Merge "Allow recycling of Preferences in com.android.* packages" into klp-dev

* commit 'd3927bd0358714fa440cbc0d9595a25b0f571562':
  Allow recycling of Preferences in com.android.* packages