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

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

Change-Id: I57b3bb907a875ebe50c9eb4bdcefef6c59207d07