Merge "Prevent the BrightLineFalsingManager from duping its session." into...
Merge "Prevent the BrightLineFalsingManager from duping its session." into qt-dev am: b340cce3 am: 7d259cba
am: 2f9a109f
Change-Id: I6f93b59d5f911ebab76eb2dc856a688555a3e57f