Merge changes I8e27f8b9,I78d2dc79 into pi-dev

* changes:
  lmkd: Optimize frequent file reads by keeping file descriptors open
  lmkd: Fix usage of ro.lmk.kill_heaviest_task property