am 99436ca8: am 6182d031: Reconcile with ics-factoryrom-2-release

* commit '99436ca879c7ec32fda845559fcb038001619dae':
  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"