tree fc2bab5645c9cab799b6b5fce4cf32f7f382996a
parent 8fc685dc42711fefbf08cee76377f879d8d5e298
parent c90b491a81636eb663e7018753af175419bd5a46
author TreeHugger Robot <treehugger-gerrit@google.com> 1584604003 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584604003 +0000

[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

Change-Id: I7a92ac395c08a3bb8f2faf54cbd46236dc8308f5