Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-r1-dev
am: 0cd732ddf3

Change-Id: I8532cd2337ae7f29a7f2ac4111ac347aec470bc8