Merge "Annotate bindServiceAsUser with SystemApi" into lmp-dev