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

Change-Id: If61234d857dcec58e7d0992d13e3e0aaa4435c2b