Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev