Merge "powerstats: update TPU energy consumer stats" into udc-d1-dev