am 81ac92df: am 6d92cde2: am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri"

* commit '81ac92df33ba146a51fbbf3d5108379a9eb346b1':
  frameworks/base: Track owner in appropriate owners list of Uri