Fix for re-enabling preference that aren't recreated on each refresh after the UXR has been lifted.
am: b4c6884286

Change-Id: Ic9325e8fecd128a52be4b455c81fb6a012286118
tree: 365b7d216e067d3dcc2fb032573d561233348c5e
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg