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

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

Change-Id: If61234d857dcec58e7d0992d13e3e0aaa4435c2b