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

* commit '35f4d32dc2f0c383323e780ecc7e2764704c5d2c':
  frameworks/base: Track owner in appropriate owners list of Uri