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

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

Change-Id: Ia809d1d0daba797ecf2d391622d6407a29e20a77