Merge "Camera2: update aberration correction related tag name" into lmp-dev