Merge "Camera2: Update aberration correction key name" into lmp-dev