tree e4c29ff801890f0c9ceeffc3211a38a93b2233e8
parent f13bb8722c6d5467f304deb4b844189b0718d915
parent 2dc2124825caa0ae3f9eb5377d57668208f940c9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583787452 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583787452 +0000

[automerger skipped] [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag am: a299714c7a -s ours am: 3f20390b0e am: 2dc2124825

Change-Id: I6178c5061efc0f327616c0c4ec96ec7d2b3baa81