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

Change-Id: Ic5848f65a75b304a79ac05213fcd88ddae6d6198