Merge "camera: enable fixed fps range boost am: e2d4897671 am: 1c18b0f227" into tm-d1-dev-plus-aosp