Merge "Add an exported flag in manifest" am: f78221dc79 am: 4abbf14a3b

Change-Id: I544a6510895f91ef4f5e4d2ae3cb74eb668f2dc1