Merge "Increases the falsing threshold when for the keyguard affordances" into lmp-mr1-dev