Merge "Add an exported flag in manifest" am: f3cc947940

Change-Id: I4dd2d3084ec27c95801a06ba136c541eadd9a9f1