am 5da82421: Merge change Iac63ebc8 into eclair-mr2

Merge commit '5da824210ee34f051c295c12f6bcc4b617da4a1a' into eclair-mr2-plus-aosp

* commit '5da824210ee34f051c295c12f6bcc4b617da4a1a':
  Make WRITE_GSERVICES into system-or-signature (instead of just signature),