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

Change-Id: I26efe76186d552ea92f0d98d1f2ae7ddf3e03822