tree e4c29ff801890f0c9ceeffc3211a38a93b2233e8
parent d9329d8680768cfc8cf2d7d3bfdeb4537e537343
parent 72162540daaf235a9842a02d5bed5369141360a9
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583789998 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583789998 +0000

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

Change-Id: I4ea063ade8dd7f3c4bc077712595bc5dc52ed634