Merge "[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" into rvc-d1-dev-plus-aosp am: 8a6f6341ac

Change-Id: Ia134c51a790471c97cb9a92094729ec070d6453b