tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 384853ee98c2bf88e33d11b553b4ff567871b552
parent 8a6f6341acd21c407442e8d41cd8ff022d54f473
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584605162 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584605162 +0000

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