Merge "bm: Support battery mitigation aidl" into main