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

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

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