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

Change-Id: Ic6d314804c6ff6af3ef0f85e6ebe01b0b6847ecf