Merge "Remove unnecessary dependency on libcore-platform-compat-config" am: 82cd5382b7

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

Change-Id: I6f407f38de4393a040d92c7073e8d4bacd400fd9