Merge "Add an exported flag in manifest" am: 8fabbfe7fe

Change-Id: I3af2ad5b766feaca6ff980edad47a7e46b003f71