Merge "Add an exported flag in manifest" am: f3cc947940 am: c9973e586e

Change-Id: I95a9a0bc9236fd07edfd809ff83ab2cb07280786