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

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

Change-Id: I4863ea5eb3a6ca04693182bccdf4d9ddbf913834