Merge "Add missing null check to AppErrors#handleAppCrashLocked" into nyc-mr1-dev am: 002dd29764
am: c327afa0df

Change-Id: I80cb7201377288d43ff9d02367f8e6917de3639f