Merge "de-HIDL: Sensor configs & Provider merge" into main