Merge "Update enums to match ConnectionEvent.aidl and SecurityAlgorithm.aidl" into main