Merge "Add framework-configinfrastructure.stubs lib" am: 6192fb8f am: ca37855a

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



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