Merge changes from topic "jsoncpp_upgrade" am: 0357790661

Original change: https://android-review.googlesource.com/c/platform/external/jsoncpp/+/1607005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e6c74459b9d6fa2246192ba8321224ff0f590fb