Merge "Add an exported flag in manifest" am: a3cd1ef0c2

Change-Id: Ifd1c81177ffd534a05743f155c50a7fea0d48340