DO NOT MERGE Add listener ids for location listening operations am: 45e623c63a am: 2e40e8a3d0

Change-Id: I368410fbc2b5247337fb99c55d0337635b1f44fd