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

[automerger skipped] Merge "Add framework-configinfrastructure.stubs lib" am: 6192fb8f am: ca37855a am: 5c25dffa -s ours

am skip reason: Merged-In I504b1be870003c0a1a785ab04c04a737f77d33fb with SHA-1 076321e6 is already in history

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



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