Merge "de-HIDL: Merge schedulers" into main