am c7a46eb1: Merge "DO NOT MERGE: Fix setTorchMode support for the old HAL version" into mnc-dr-dev

* commit 'c7a46eb1538a3ef8d53575084d80f2f3eacd77ba':
  DO NOT MERGE: Fix setTorchMode support for the old HAL version