Merge "Merge "Break infinite refresh loop in battery estimates" into qt-dev am: e418874921
am: a7fba3efe2" into qt-r1-dev-plus-aosp
am: 5465e927e3
Change-Id: Ib241cacc398aff9cad18e42c3f4d5762a0cb80a7
This commit is contained in: