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

[automerger skipped] [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag am: a299714c7a -s ours am: 3f20390b0e am: 2dc2124825 am: 72162540da am: 0f5300d77b -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf2037e0d29dcb075eb89bf39b786fd8e504a70b