[automerger skipped] [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag am: a299714c7a -s ours am: 3f20390b0e

Change-Id: I7cc17ad085ba2154021988578d3d71910a6b445b