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

Change-Id: I72c9a4358bcca8bb255edd82a45f926b52464491