FINALLY, my battery life suddenly got back to normal. Factory reset did nothing, still drained for several days.

What seemed weird to me, was it was taking a long time to charge - it would say something like 98%, and 4 minutes to full charge, but would still take another 1/2 hour to charge. Then, when it said 100%, the light on the charger was still red, which seemed strange.

So, I charged overnight, woke up, saw it at 100% but charger red, power cycled (held power until it rebooted), put it back on the charger while I showered, and finally the light was green.

I'm now 28 hours in with AOD on, and just hit 50%. I think it's back to normal! Hope that helps someone!