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

Change-Id: Ifb08616cf54ad5c01d58de793fdec15e0802da7b