Merge "Removed HardwarePropertiesManagerService helper." into nyc-dev