Revert "upstream"

This reverts commit 765a1f4d12e57584f913356a050f967dcd6882a2.
Revert "When in JF..."

This reverts commit ec6fc2f66ee7c3f60f132fd1e877405831d5c8d0.
treat UART as AC for the purpose of charging