Merge "DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType." into qt-dev
am: 6c9547a9a5

Change-Id: I2d4d5e094c415828ed22bf2d64889ac1f3d931f8