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

Change-Id: I6178c5061efc0f327616c0c4ec96ec7d2b3baa81