[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-r1-dev am: 0cd732dd
am: 4ae5be91 -s ours
am skip reason: subject contains skip directive
Change-Id: If8ecba15f52cf2401fed8181674cbd5890527625