Merge changes from topic "am-fa9741c9c05a4b19ab12f2b89663cacb"

* changes:
  [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 -s ours
  [automerger skipped] Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551d" into android12L-tests-dev am: 50cac03f am: b30ffaea -s ours