Merge "Regenerate system api due to setSimPower api additions Bug: 72039360 Test: None - simple alphabetical reordering of file"