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

Change-Id: Ifc0f67b6d640b6f4333766fd9010c4b277fd0f94