Merge "Add an exported flag in manifest" am: 4a3dd98a05

Change-Id: I4741f943493d1cfde469bcf60f1677736f8d5000