Merge "Guarding against RecoverableSecurityException in N." into arc-apps
am: 1cd40fff7a

Change-Id: I168b823af8d7eeba7efdfe44cb625eb844184565