Merge "Don't try to show crash dialog if lock screen is showing." into nyc-mr1-dev
am: cb443c529b

Change-Id: I2063f989c441657ee903749dd507f489d610e7bf