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

am skip reason: subject contains skip directive

Change-Id: Ic8a27e87f1376610a4ca6d60e8e59f0bd7985b51