am 6182d031: Reconcile with ics-factoryrom-2-release
* commit '6182d031':
Revert "Merge "libnl_2: Fix memory leaks" into ics-mr0"
Revert "Merge "charger: make the almost-full frame only show when it's current level" into ics-mr0"
Revert "Merge "Remove log spam" into ics-mr0"