Merge "Add framework-configinfrastructure lib" am: 42202a9bd0

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

Change-Id: I317f7513c16fbf7a2adb5420c57631ec131908f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>