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

Change-Id: I18bf350eac7eb8c3e5c9ce80bb04a0793722d1c1