Merge "Add an exported flag in manifest" am: 199f7e3e19 am: 4dc1fd47b0

Change-Id: Iabecf0a6290c9b370a906e71bd277b416ec9989b