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

Change-Id: I0f1657b2665f02a9a17dc2e549826c75a09fd538