Reland "Make override immediately override aconfigd"

This reverts commit 0d840015d48f426923f404e9a3058be06d9dc3c4.

Reason for revert: guard the change with a flag

Change-Id: If279c8cafb020367203f85695b60dcec4b52b168
1 file changed