Merge "Add an exported flag in manifest" am: 27e67ad98b

Change-Id: Ic076182428d12929370cf7705dd147b71c8120f9