am 0fe253b7: am fedd4359: am 2df1a505: am f5b7af14: Merge "Prevent security exceptions from crashing Gmail" into ub-gmail-ur14-dev

* commit '0fe253b77f8bf44ab35df17aa15f770012f87f77':
  Prevent security exceptions from crashing Gmail
diff --git a/src/com/android/mail/utils/AttachmentUtils.java b/src/com/android/mail/utils/AttachmentUtils.java
index 85f5206..4837f7a 100644
--- a/src/com/android/mail/utils/AttachmentUtils.java
+++ b/src/com/android/mail/utils/AttachmentUtils.java
@@ -231,7 +231,7 @@
             }
 
             return cachedFileUri;
-        } catch (IOException e) {
+        } catch (IOException | SecurityException e) {
             // Catch any exception here to allow for unexpected failures during caching se we don't
             // leave app in inconsistent state as we call this method outside of a transaction for
             // performance reasons.