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

Merge "Remove unnecessary dependency on libcore-platform-compat-config" am: 82cd5382 am: e70b70a7 am: f083c90a

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

Change-Id: I1c3ed0bb99cb1a61397147f75b752cd921a6cc6d