tree e4c29ff801890f0c9ceeffc3211a38a93b2233e8
parent 0f5300d77bb7497ff433e42697a0577900f2fb1f
parent fe0098b79b87f2c281e7a6f600288120af30ac7d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583790163 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583790163 +0000

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

Change-Id: Ic09a5d171b5ddfb5a4de172e995c7a2c33d1b344