am efa4dee1: am 977d421a: am f0e5501e: Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev

* commit 'efa4dee1263f0e332f015affbcef2234f38e2e93':
  Fix issue #22989030: Separate battery whitelists