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

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

Change-Id: Ib9c6d4da1a299c22135e4fc6c06f4891c6fcf4d5