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

Change-Id: Iecd92d58c30f35b43d1ef1f299656e4abf39ba1b