[automerger skipped] Merge "Revert "[DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag"" into qt-qpr1-dev am: fe04158ce4 -s ours am: 84b6eab046 am: 5498185e4b am: 32d24305f0

Change-Id: I17f0492fbcf9f85dd014849b565490db2266d6a5