Merge "Grant OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD to Shell" am: 9a24f337aa am: 780e00790d am: f7d6fde325

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

Change-Id: Ice653f148e2d8930f58a73e36ddcaa5ffd96a4d7