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

* commit '977d421af9466ed6cd83630f6ba91c873f501e5b':
  Fix issue #22989030: Separate battery whitelists