Merge remote-tracking branch 'aosp/upstream-master'

* aosp/upstream-master:
  Add ServiceProcessor to MainProcessor

Bug: 318750023
Test: m javac-check
Change-Id: Ie073f84085384b0cbfece22ad857bfe8eaa4e96a