Merge "Version bump to AXF4.240130.002 [core/build_id.mk]" into androidx-hilt-release