[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 am: 384853ee98 -s ours

am skip reason: subject contains skip directive

Change-Id: I6172b1cefd838895851db6fc7f7efb076c2c86bf