[automerger skipped] DO NOT MERGE Add preference controller for displaying the reset esim option on the factory reset page.
am: 10597aff5b -s ours
am skip reason: subject contains skip directive

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