[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: c90b491a81 am: 5b67b58e79

Change-Id: Ib9ef1cb0975791c3321682d5924ed474eeb9e14c