Merge "SAR: Modify tx power API am: cea38b3bba am: 5db6c1cd24" into oc-mr1-dev-plus-aosp