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

Change-Id: I2e9d7643544b854681e80a5a2e4707e2a15503bd