Merge "AOD: Refactor always on configuration"