Merge "Revert "Revert "[jsoncpp] disable JSONCPP_DEPRECATED to make upgrade easier""" am: 2c2a456ec8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8746466bed0afb68deb63038c07f1e29890ac035