Merge "Fix: Aidl equality not working" into main