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

Change-Id: I91ef7217c55e34dc8fe2a3e6ba07f43fcd4ba36f