[automerger skipped] DO NOT MERGE Allow the new BrightLineFalsingManager to be...
[automerger skipped] DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. am: 84c07e9f
am: e941dd89 -s ours
am skip reason: subject contains skip directive
Change-Id: If77fb216b8885e84aeba016b136ec69077235deb