[automerger skipped] Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev am: 6c9547a9a5 -s ours
am: 756636cb24 -s ours
am skip reason: change_id I0ab9a72d66bf56a56df2de2ad2d247f299d1b748 with SHA1 e0321d5809 is in history

Change-Id: I2e466feae4c5936c0409689c6dfa2a3d10e3c338