am 9b1bd624: drop a couple of triggers on contacts  tables and move them to code.

Merge commit '9b1bd62417ef1764829398a61c3d5df93a924106' into eclair-mr2-plus-aosp

* commit '9b1bd62417ef1764829398a61c3d5df93a924106':
  drop a couple of triggers on contacts  tables and move them to code.