[automerger skipped] Merge "Merge "Merge "libcutils_test: static libjsoncpp"...

[automerger skipped] Merge "Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551d" into android12L-tests-dev am: 50cac03f" into android13-tests-dev am: 2520bfb0 am: 1400b2dc am: 1f80c8bf am: 4e9b5860 -s ours

am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 447b4a4b is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475



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