Merge "Revert "power: update the AIDL client ver 3"" into power.lnx.5.0.r1-rel