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

Change-Id: Ib3766f34162d43f2cdb49cf09fa118694b37c1a1