Merge "Add an exported flag in manifest" am: dd834e8fc7 am: e456dafaf2

Change-Id: I76747e7c8aee45dd04779e2c2d71ca736a2260b1