Merge "Add an exported flag in manifest" am: 9480d03c73

Change-Id: I7a2bd61ea9c29512a0534b805ed6edca786dfc09