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

Change-Id: Ia1d21bb00bbb61ee99a6080d19795cc71de210a8