Record NR State changes in BatteryHistory and track NR NSA time.

Add NR state awareness to BatteryStats. This allows the ability to
distinguish an NR NSA mode connection (which is the combine state
of Network type == LTE and NR state == connected).

Fixes: 282770637
Test: atest BatteryStatsHistoryTest
Test: atest BatteryStatsNoteTest
Change-Id: I335c9a0c22e662ae8c86f77cc5b3debd71b76bb6