Merge "SystemUI: Fix NPE in BatteryMeterView" into r-keystone-qcom-dev