Merge "Add an exported flag in manifest" am: 68de1ce779

Change-Id: I8224e643d15401427f11e6a24794510564e511e7