Merge "Merge "Prevent the BrightLineFalsingManager from duping its session." into qt-dev am: b340cce330 am: ac20ec6310 am: 4ec2818a23" into qt-qpr1-dev-plus-aosp
am: b4f52bdcbf

Change-Id: Iefd8b010f107372408695fb41ad564b26404bc4b