Merge "Camera: Allow maxDigitalZoom to be less than maxZoomRatio" into rvc-dev am: 25ff02b703 am: 60747b7823

Change-Id: I44784255c2e6e33af9b36e2393f4eb8ce447f3aa