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

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

Change-Id: I57e9f5cd7135a5ab8fe233c1345f78efc179942b