Merge "Merge "Make Settings and SysUI estimates use same data class" into...
Merge "Merge "Make Settings and SysUI estimates use same data class" into qt-dev am: d6aa4d3e" into qt-dev-plus-aosp
am: c3e070bb
Change-Id: Ibe4144e19325481209a3fef9c89cfb1fa956d518