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

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

Change-Id: Ib99f0cd6e794a34c5383fcf72c58716dc7790718