Merge "[framework] Add more oem extension APIs" into main