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

* commit '8e63bbfd00ee27fcdbb04cfc0cf96ccdb2c50cc5':
  Fix issue #22989030: Separate battery whitelists