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

Change-Id: I16e0b4b681c14d63f817284f4941f7dcf8936b46