Merge "Load UGD dependencies from SPHAL on non-VNDK devices" into main