[automerger skipped] Merge "Add framework-configinfrastructure lib" am:...

[automerger skipped] Merge "Add framework-configinfrastructure lib" am: 42202a9b am: ec65fb2f am: e9ad8f40 -s ours

am skip reason: Merged-In I85bd435fb95c7ee6c641cb6679affa9026cf4220 with SHA-1 4ad22ce1 is already in history

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



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