Merge "Merge "Update battery content description." into qt-dev am: 5c9415dd1a" into qt-dev-plus-aosp am: 8e22543ba4
am: b6eb56f332
Change-Id: I597d4dcb609d8adf03ed23c4994e96c3261398ce
This commit is contained in: