tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent f6ef78aa9339340796b9b0ce8cbbb4acbba91469
parent 5b67b58e7902d813616ce7db80e3ad81cf520af5
author TreeHugger Robot <treehugger-gerrit@google.com> 1584605125 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584605125 +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 am: 5b67b58e79

Change-Id: Ib9ef1cb0975791c3321682d5924ed474eeb9e14c