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

Change-Id: I29218533f0da8b95a2a9e3228be53232bf774919