Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev
am: c6e9bb9da0

Change-Id: Ib8e1512e06cc81ddf9e7f9beac1eef49d232ffc0