Merge "Rename getters and setters android.compat.Compatibility.ChangeConfig"