[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: 1b0611e00f am: 9efbd07ded

Change-Id: Ie04b90edd378b44fce2f29745db17ac49ac88b85