[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: f2055b8e76 -s ours
am skip reason: subject contains skip directive
Change-Id: I14c98e1116eef750acd9585055fecc2540f02b4f
This commit is contained in: