Merge "Camera2: framework updates for HAL3.3 keys"