Merge changes Ic6b623a7,Ib6811066

* changes:
  Makes minor modifications to Intent-based Service APIs
  Adds AIDL definitions for register/unregisterIntent