Merge "Add JSON output to the RKP factory tool" into sc-dev am: 90a2b2780f

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

Change-Id: Ice4120dc6392abeabb6ff22df8624277d54292c7