Merge "Fix issue #22989030: Separate battery whitelists" into mnc-dev