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

Change-Id: Ieb9435479b727da5ea3ce5f512b43986898675fd