Merge changes from topic "oct5"

* changes:
  Slight relaxing of Context.getUserId() checks.
  Exclude Telephony Binder interfaces.