Merge "Merge "Prevent the BrightLineFalsingManager from duping its session." into qt-dev am: b340cce3 am: ac20ec63 am: 4ec2818a" into qt-qpr1-dev-plus-aosp