Merge "public API for VideoProfile.CameraCapability with zoom" am: 610673690c
am: efac7fdbf7

Change-Id: Ifa619269c6781a3653b6dafc80380f1857dd554e