Merge "Revert "Camera: Collect MPC test results in CTS and ITS"" am: de559c6929 am: 47b48ca43e

Original change: https://android-review.googlesource.com/c/platform/cts/+/1959731

Change-Id: I1767ee03634a0f86261c8e2363fea43ec4e5c2dc