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

am skip reason: subject contains skip directive

Change-Id: Id64b1cab7dc5a67864753a28f785d19147eef081