tree e4c29ff801890f0c9ceeffc3211a38a93b2233e8
parent ce504b45e8c4b8dea9113d6fc91aa0fcd1f25df0
parent 3ee0451508c881fdb233cedc00d001c6d469f338
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583788706 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583788706 +0000

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

Change-Id: Ibc5abd3cb3457ecdf80806cf47c21ff7ba3267c8