Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94 am: 0428fa5453

Change-Id: I2b7721b759febb75ea9731e57cb48b54f95fec64