Merge "Fix issue #121104681: Force stopping AGSA causes system to revert to its default impl"