Merge "Set minsdk for AIDL libs to 31" into main