[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: e0321d58
am: 59809cd9 -s ours
am skip reason: change_id I0ab9a72d66bf56a56df2de2ad2d247f299d1b748 with SHA1 84c07e9f is in history
Change-Id: I2144c9f5e844310c2a0d53bb96fced4bfd4bc1aa