Add AOSP smart battery entries

 - Revert "Cleanup smart battery entries (1/3)" patch only instead whole topic, updated part of codes to resolve the conflicts

This reverts commit 742e506d.

Reason for revert: b/315401539

Bug: 315401539

Change-Id: I75a4e4f75b624c90aae18288c77214c0238e43eb