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

Change-Id: Ie01f0455e23b299ec6745b4d20e32fed93738db6