Merge changes from topic "session_chars_cp" into main

* changes:
  camera2: Ensure SessionCharacteristics and CameraCharactersitics can be used interchangeably
  Camera2: Add Session Characteristic keys by query version.