Merge "Make system_server stubs consistent with other stubs" into rvc-dev am: 10af06b52f

Change-Id: I77330dfa2ac0ff858becd33ec4fff1e272f4434c