Merge "Allow BrightLineFalsingManager settings to be experimented with via Phenotype." into qt-r1-dev
am: 1ec1ecb364

Change-Id: I8ff7f9c7f9e9c4d10d5e36285f6ac043de8cca11