Merge "Add an exported flag in manifest" am: 199f7e3e19 am: 4dc1fd47b0 am: d7279156ab am: e99123b7e1

Change-Id: I28fc99f5d43d91e8e38dccd4a4f5080dd71ff8a1