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

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

Change-Id: I4125df76162b59617e071b9a72f8cbad1a7916c2