Merge "Add an exported flag in manifest" am: 6101fdd258 am: c436e2f2a7 am: f07abd8abb

Change-Id: Ibaa38aa34b220099e80bf08649f6eb10e2f9764e