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

Change-Id: I56ca831bd6929c8692ac4c93aed52d5c1fb46e24