[automerger skipped] DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. am: e0321d5809 am: 59809cd9e1 -s ours
am: 19656fc099 -s ours
am skip reason: subject contains skip directive

Change-Id: I8b4d22146ce94098aebd9dfc56a1f84a770dc970