Merge "Allow for more wiggle room (literally) in BrightlineFalsingManager." into qt-r1-dev
am: 9dccbdca70

Change-Id: I2fa5aa641de7186da4bbb0b2703059a233839c54