Merge "Update LocationManagerService wakelock tag to follow the naming convention."