[automerger skipped] Merge "DO NOT MERGE Allow the new...
[automerger skipped] Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev am: 6c9547a9 am: 8ae38a2c -s ours
am: 96fdf004 -s ours
am skip reason: subject contains skip directive
Change-Id: I394560d5b44b701f5f7acf970cf47c52f1ebd47f