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

Change-Id: Iead5b876acbc2591f3074c0d0829ca13cf44d6e3