tree 64f8d10db998c678fdbcee79ae12fdacbca0eae9
parent 9b6f03f8f8ec60d41a4422910e352c1f30738867
parent 20171fef1af2d5de6fc173413d3e7fd7836f0abc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584606239 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584606239 +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 am: 20171fef1a -s ours

am skip reason: subject contains skip directive

Change-Id: I16e7314cafb4f74ae90cc7d664c910969e8bdb32