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

Change-Id: I8a7e6582c928ee9498594787655b6e5c9d3e618f