[automerger] Merge "Config to enable/disable AOD via overlay" into pi-dev am: b784e6f7bc am: dbaa859020

Change-Id: I28f94afdf78fd73fb32963106ba0ab36d6f30cdd