Merge "[DO NOT MERGE]Fix build break for the diverge of hidl in main branch" into 24D1-dev