am 38c3386a: resolved conflicts for merge of 03be4928 to lmp-mr1-dev-plus-aosp

* commit '38c3386a6cd44789f540fb9700c284345e7269e3':
  Healthd: Remove unused variables