Merge \\"Camera: API1: Improve ZSL mode activation heuristics\\" into nyc-mr1-dev am: 879234b240
am: c4c56c41cf

Change-Id: Ice8cdced14bb42eaab198dc7901936d9046aef42