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

Change-Id: I9ed14f11fbb04dd6fe8d02722d8aec8b1ba10682