Merge "Make SystemService constructor take a Context." into klp-modular-dev