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

Change-Id: I14027f7967a0c4de691110b6a96ae46ea6424ca5