am e81e1816: am 6aeabbf2: (-s ours) am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'e81e1816c86e27deab8935454648a2ee09130ddd':
This commit is contained in: