Merge "Camera2: remove redundant legacy key check" into lmp-dev