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