Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94 am: 0428fa5453 am: 7bc73dd05d

Change-Id: I546d11a65d5a69f64275d7a4ff37ba5b6a708c88