tree 4ef67c0fec1e997fd5c92976016fb2d8d050809b
parent 5f0e119bdc97febf65e59dd7d45f5ba454d4e146
parent 59809cd9e1659e76c2524aa335332365a7d92d8a
author Dave Mankoff <mankoff@google.com> 1561388422 -0700
committer android-build-merger <android-build-merger@google.com> 1561388422 -0700

[automerger skipped] DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType. am: e0321d5809
am: 59809cd9e1 -s ours
am skip reason: change_id I0ab9a72d66bf56a56df2de2ad2d247f299d1b748 with SHA1 84c07e9f1a is in history

Change-Id: I2144c9f5e844310c2a0d53bb96fced4bfd4bc1aa