Merge "Add an exported flag in manifest" am: 2e60c56ea9

Change-Id: I3fbd69e4f9e5b38c108335bdfc8b83d7a998fd65