Merge "AafDecrypt.java: Fixed sonar issue"