Merge "Drop per-app measured energy when an OTA changes the set of energy components"