Merge "CDD: Preinstalled assistant apps specific requirements related to      context sharing indication." into nyc-mr1-dev am: 79fa0e5610
am: 50e4bf6fc9

Change-Id: Icaad375ed8988580d7d2c6d584d3985a61315e3f