am 66e9b1e1: Merge "Move SystemService code to frameworks/base/core" into klp-modular-dev

* commit '66e9b1e1178813037daf3798b8fe23467c4b91ab':
  Move SystemService code to frameworks/base/core