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

Change-Id: I7fbeebe78d5160bd6cb9af13bfe76272bf3c7133