tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 3dfbd16246d8dcb88f547283fa9300fbdeb6a1ab
parent 84b6eab04601c4b064e97b390be01c3135dd1396
author TreeHugger Robot <treehugger-gerrit@google.com> 1584603226 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584603226 +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

Change-Id: I5607040ec04f20c7958ec5efd31ec8d41bc696d2