Merge "Add an exported flag in manifest" am: c2f7182ea0 am: d72f44d3ed

Change-Id: I664a98ff2fd5e29aa6830d07a02e6e71fa6747dc