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 am: 1db80b81

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

Change-Id: Iee90f01b378c5540dc2d1ce119fd5a4fe72370ee