Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848 am: 65a4e23b66
am: c69d130d00

Change-Id: I712fd1223976ba3b1f74b61489efd110252edcd9