Merge "Add an exported flag in manifest" am: bac3f8ae4d am: d535ef26a6 am: 1f2f74018c am: 0bd4cdb4bb

Change-Id: Iaf6cc97bb9f0a2525f983649f9d41d3ca002b502