Merge "DO NOT MERGE Add listener ids for location listening operations" into rvc-dev am: 53566da190

Change-Id: I2deb65f5dd65243576b3b21d50ce285b80c8cede