Merge "Add an exported flag in manifest" am: 8fabbfe7fe am: 9dd324bae9 am: 0f9cd82e15 am: da2491367a am: 7f20f1d90e

Change-Id: I220d466b54a058a04e46c3cb60a8afbf6f0349b2