Merge "Add NonNull annotation into unregisterThermalStatusCallback"