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

Change-Id: I2040f2c067f7b84f1962fe7d6ca1c2ae4e7bb04d