Merge "camera2: Add key enumeration functionality to CameraMetadata" into klp-dev