Merge "Revert "Camera2: Make static_camera_characteristics const."" into jb-mr1-dev