Merge "More updates to battery optimization whitelist" into mnc-dev