Merge "Add an exported flag in manifest" am: 6101fdd258

Change-Id: Ic805a7dfe547af35e8da2f607d0b8a7df8636093