Merge \\"Fix issue #29545190: JobScheduler ContentUri NOTIFY_FOR_DESCENDANTS flag...\\" into nyc-dev am: a62a7eef24
am: 56197c9e9e

Change-Id: I332d08b49f51558d090b43ff0ed566ae9fbfa002