Merge "Add flags for android U sharesheet features." into tm-qpr-dev