Merge "Add an exported flag in manifest" am: 7553052328 am: d6073dd1ef

Change-Id: Ief50de28dc9ce1c88acfafa19507e40d94fb626a