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

Change-Id: Ia32701aa3b3b6b6eb0f87df614ed68ba75d1d385