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

Change-Id: Ied563746fdfcef5e93a3ef77ceb267884dbb19fa