Merge "Prevent the BrightLineFalsingManager from duping its session." into qt-dev
am: b340cce330

Change-Id: I2cc3960d5c85105244de1a23b606a01a9bf4cb81