Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev