Merge "Rename getters and setters android.compat.Compatibility.ChangeConfig" am: 0a632252af am: 20cc15ed7b am: 5f84d097bc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691046

Change-Id: I02ca99ba10297d95dee04c0962b30a45ead40802