Merge "rkp_factory_extraction_tool: Add instance name in the JSON output" am: a196f029aa am: 4cd14a3749

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2017316

Change-Id: I0edf4c71b3c75a1f0dad183ec9d3b26142981e60