Merge "Add AOSP smart battery entries" into main