Merge "Merge "Add battery estimate to content description." into qt-dev am: 0fbcf57e am: ec7c76de" into qt-r1-dev-plus-aosp