am e06751fc: [Issue 2084032] Adding support for legacy contacts uris "people/#/organizations" and "people/#/organizations/#"

Merge commit 'e06751fce696a31fcba173821dbe78b08bae20be' into eclair-plus-aosp

* commit 'e06751fce696a31fcba173821dbe78b08bae20be':
  [Issue 2084032] Adding support for legacy contacts uris "people/#/organizations" and "people/#/organizations/#"