Merge "Add to javadoc for onAidConflictOccurred to clarify what can be done to recitify that error." into main