Merge "Camera2/3 HAL test: cleanup deprecated keys" into lmp-mr1-dev