Merge "FalsingManager: Allow disabling the HIC via device config flag" into oc-mr1-dev am: b0d617a643
am: dc70defa05

Change-Id: I6477e57f61eb3b80795b8eed273d3a123b382699