Merge "camera2: Update CameraCharactericsTest to check key in #getKeys() list" into klp-dev