Merge "Add an exported flag in manifest" am: a3cd1ef0c2 am: 427b16dcaa

Change-Id: I7f01b037ab44ba1b3a6052a19de7b5c37f9f02fd