[automerger skipped] Merge "Make system_server stubs consistent with other...
[automerger skipped] Merge "Make system_server stubs consistent with other stubs" am: f6aead08 am: aa81094f -s ours am: 3ba94a93 -s ours
am skip reason: Change-Id Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e with SHA-1 bbd78556 is in history
Change-Id: I70cc0fcefc387620188df9ffd6f52c9e9b4888eb