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

Change-Id: I5d06b09eff73091f8158111a3c1dbae2c4f35cbc