am 6826b25c: Merge "Report specific exception type on decrypt with invalid session" into mnc-dev

* commit '6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5':
  Report specific exception type on decrypt with invalid session