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

Change-Id: I75c1808758a767eb7028d312b0542f2175a55a51