Merge "Fixed battery chart flickering" into main

        android:id="@+id/battery_chart_group"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:alpha="0">

        android:orientation="vertical">

        <com.android.settings.fuelgauge.batteryusage.BatteryChartView

            android:id="@+id/daily_battery_chart"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="@dimen/chartview_layout_height"

            android:layout_marginBottom="16dp"

            android:visibility="visible"

            android:visibility="gone"

            android:contentDescription="@string/hourly_battery_usage_chart"

            android:textAppearance="?android:attr/textAppearanceSmall"

            settings:textColor="?android:attr/textColorSecondary" />

        }

        if (mDailyChartView != dailyChartView || mHourlyChartView != hourlyChartView) {

            mHandler.post(() -> setBatteryChartViewInner(dailyChartView, hourlyChartView));

            animateBatteryChartViewGroup();

        }

        if (mBatteryChartViewGroup != null) {

            final View grandparentView = (View) mBatteryChartViewGroup.getParent();