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

Change-Id: Id2540d8e557f2793d3e00a667c26b4efef49a3fc