Merge "skip notify descendent for SubscriptionManager.CONTENT_URI"
am: d1991908f0

Change-Id: I02f21a2b673edca01650a4f3e4400f4e2ef26e7b