[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 skip reason: Change-Id Iead5af4152a49cd59a4fd7afc0312c2f0c872c1e with SHA-1 bbd78556 is in history
Change-Id: I63e7e4fcd0e9b97b3c6c784d66276d1706b6f054