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

[automerger skipped] Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551d" into android12L-tests-dev am: 50cac03f am: b30ffaea -s ours

am skip reason: Merged-In Ic84901ce5af766338b2cab07c3cf10841ba9a150 with SHA-1 40b59a61 is already in history

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



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