Merge \"Fix bug where swiping on the fp sensor when the screen is off causes blank screen\" into nyc-mr1-dev
am: 538b836e05

Change-Id: I8391201f96bc408103727938a9b9aefd22f47793