Merge "Add an exported flag in manifest" am: cda4a6c0af am: 7f4bc7b7bd am: a000bd648a am: e7540e2643 am: 656c897c9c

Change-Id: I63ad056895eadc1750bf4aac255a180d7b1e2dbb