Merge "Add an exported flag in manifest" am: 199f7e3e19

Change-Id: If5632242998efaec63c3e14c3528d19fcd6b9610