Merge "camera2: Fix broken camera metadata test due to key rename"